In preparation for the 0.5 release