hurrr
Merge pull request #1 from Veux/master