adjust diff from v0.0.1-4 to master