Preparing for 0.4 release and support for Gotham