Cleanup
Merge pull request #21 from bperel/master

Cleanup