Update #18

Closed
muellerr wants to merge 17 commits from mueller/update into develop
No description provided.