implements/fixes #176, fixes #172, fixes #171
Merge remote-tracking branch 'origin/development' into development