Merge pull request #200 from eVoLuTiVeMEDIA/master

Some tool improvements.