Merge pull request #22 from sdabet/master-v2

Customizable margins
Update comments
Update Authors
Update Authors