Merge pull request #26 from Etharr/polish