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

Mitab