Merge pull request #48 from SaveTheRbtz/master

Bugfixes and documentation improvements
v0.21.20