Merge pull request #23 from emocentmagar/krazz

Krazz
bug fixed