Bugfixes

Philip ABBETrequested to merge
bugfixes into master

I have started to work on #57 (closed) too, but it's not done yet.

Merge request reports