other mods
Merge branch 'master' of github.com:jploh/Osclass