Fixes #121
Fixes #118
Fixes #128
Merge pull request #138 from HSWebteam/userguide

Looks alright to me