Merge pull request #5 from briardes/master

Merge
margin