commit v-0.1.2-1025
Merge remote-tracking branch 'origin/0.1.2'