Merge pull request #2 from Bropwnz0r/master

master