Cleanup
Merge pull request #15 from Przybysz/initial

Cleanup