Merge pull request #2 from Bropwnz0r/master

master
Merge pull request #3 from Bropwnz0r/blog

Merge pull request #2 from Bropwnz0r/master