Fixed bug with gravity and margin
Merge branch 'hotfix/0.1.2'