Release 0.9.4 merged back to master