Merge pull request #30 from emocentmagar/krazz

Krazz
some changes
conflict resolved
Merge pull request #31 from emocentmagar/mitab

Mitab
terms