Extra polish
Merge pull request #17 from vertigokidd/polish

Extra polish