Merge pull request #75 from photonicgeek/master

Fixed stuff
Merge pull request #1 from offensive-security/master

Merge pull request #75 from photonicgeek/master