own fork of this crap
Merge pull request #1 from dukzcry/master

own fork of this crap