fixes #100 fixes #93
Merge remote-tracking branch 'origin/master'