Merge pull request #2 from tangeb/master

Merge request for this cool feature development