Adding an additional check before downloading any files and other minor changes.
Merge branch 'develop' of https://github.com/XIMDEX/ximdex into develop