Merge pull request #2 from switchpwn/master

Merge with master