Nicks commit
Merge pull request #1 from l00ph0le/master

Nicks commit