Adapted latest cyvasse-common (compiling but probably not working)