Some Cleanup
Merge branch 'master' of https://github.com/facing-n/margin