fixes #73
Merge remote-tracking branch 'origin/issue73' into issue73