Cleanup a bit
Merge branch '2.x' of github.com:mslonina/Mechanic into 2.x