Third commit
Merge pull request #2 from Peppson/master

Second festure merged