fixes #27
Merge remote-tracking branch 'origin/master' into 30