bump
Merge pull request #6 from zDemoniac/master

merge