Merge pull request #16 from knaperek/master

Cleanup of the new code