Updated with official 0.9.5 build, plus some other clean-up & enhancement