3.0.4. Closes 89; #closes 95