cool feature
Merge pull request #1 from maldo/master

Test..