Catch up to 0.4.0pre and fixes to #40 and #62