I did merge work from v0.1.0-branch into master.