Added check for clang
Modified which compiler "should" be present
Merge branches 'dev' and 'master'