add changes from v0.3.3, upcoming v0.3.4