Update
Merge pull request #8 from g3hammers/master

Update