Merge pull request #1 from doingmw/master

PoHazer 0.1