Fixes #11
Merge remote-tracking branch 'origin/master' into 1.0.7