Forward-port 0.3.2 updates into master

fixes issue #600