sync 0.1.2-alpha to master