Merge pull request #3 from Vandenn/master

Merge