some changes
Merge pull request #16 from emocentmagar/krazz

some changes