fixes
Merge pull request #181 from Bonder-MJ/master

fixes