Cleanup
Merge pull request #44 from Ninir/cleanup

Cleanup