[0.9.4-dev] Version update and some changes