fixes #372 fixes #378
Merge pull request #418 from anserran/master

fixes #372 fixes #378