Added C++11 and ROOT6 support