some changes
Merge pull request #48 from emocentmagar/krazz

some changes