#201 margins added
Merge remote-tracking branch 'origin/develop' into pocket-api