Merge pull request #4 from najoshi/master

pull for latest version