Merge pull request #138 from Pwnoz0r/DEV-09.22.2013

Merge pull request #137 from Pwnoz0r/master
Merge pull request #139 from Pwnoz0r/master

Merge pull request #138 from Pwnoz0r/DEV-09.22.2013