Added support for CXX option
Merge branch 'develop'