Clean up
Merge pull request #9 from andreif/master

Clean up