Merge pull request #56 from Etharr/polish