[merge branch 'release 0.1']