Merge pull request #4 from Vandenn/master

Merge