Merge changes for 0.3.2