First attempt at fixing lp:1097227
Merge branch 'master' of github.com:jokerdino/mechanig