Merge pull request #137 from Alexpux/develop

Check and convert passed ROOT_DIR