fix
Merge branch 'Josh-branch' of https://github.com/Borimir/Shammons2 into Josh-branch