Merge pull request #34 from Mause/master

Cleanup, streamlining and tests
Add developers' note