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

Mitab