Clang support added. Little improvements.