Cleanup
Merge pull request #5 from michalc/master

Cleanup