pull 0.4 changes into Fuzzybear branch