Include scale in margin calculation
Merge pull request #43 from dhawt/fix_specs

Include scale in margin calculation