Apart from that the Cython file is theoretically ready for merge. Looks very polished now...