Merge branches 'devAST' and 'master' into devAST
fixed warnings about virtual function
Merge branches 'master' and 'devAST'