Fixade mina derps
Merge branch 'develop' of https://github.com/johbe559/schumacher into develop