shmuz Merge pull request #42 from jonringer/patch-1