Merge pull request #66 from shayhowe/master

Margin hotfix