Closes #13 and #19
Merge pull request #20 from crowdworks/correct-margin

Closes #13 and #19