change setupDimensions to convert 'margin' into an object
Merge pull request #36 from unsignedint/master

change setupDimensions to convert 'margin' into an object