Code refactoring and back to the margin.
Merge branch 'master' of https://github.com/jeroen/motherplate