Update changes in anticipation of 0.4 release