modifications to libquantum
After merge commit