fixes #94
Merge branch 'master' into history