bugfix for #202
Merge remote-tracking branch 'origin/1.0-bugfix' into 1.0-bugfix