Margin adjustment. Fixes issue #33 and #30.