Implements #10 :sunglasses:
Merge pull request #11 from gerep/master

Implements #10 :sunglasses: