Fixed ximTOUR and minor errors
Merge branch 'dc1' of https://github.com/XIMDEX/ximdex into dc1