Merge pull request #8 from maciek-slon/master

Cleanups in code