Merge pull request #1167 in master
Merge pull request #1184 in master
Fixes wrong indention in user guide
Merge pull request #1201
Merge pull request #1201 in develop