Merge pull request #319 from JohannesPfeifer/master

Bugfixes, documentation, and features
Bugfix in rplot + typo correction