Put the 0.1.4 changes back in which got lost when I switched to the ffi branch.