Merge pull request #4 from andrewlook/master

polish