Merge pull request #92 from Bonder-MJ/master

fixes