Added C++ support
Merge branch 'c++-development' of github.com:cgcai/SVY21