some final polish
Merge pull request #9 from psilva261/master

some final polish