Merge pull request #132 from kengruven/master