Merge pull request #1 from Phell0x/master

kl