Incorporate changes from topic/segfault.
Merge branch 'cython' into wardens
Limping towards functionality.