Merge pull request #52 from gogoprog/patch-1