remove debug-code
add some more documentation
Merge branch 'hotfix/0.3.1'