Merge branch 'dev'
Add compiler flags  --std=c++11
Add 'override' keyword to virtual functions