Merge pull request #43 from rajdakin/patch-1