* Merged twisti branch to default. This merge introduces C++ wrapper