update
Merge pull request #146 from Useful-Innovation/johans-fixes

update