fixes #72 and #136
Merge remote-tracking branch 'origin/development' into development