Merged last update from v0.4