vinjn Merge pull request #49 from mattparks/patch-1 …