fixes #87 , fixes #86
commit
Merge remote-tracking branch 'origin/master'