b
Merge pull request #3 from zDemoniac/master

merge