First commit copy from official repo version 0.6.2
Merge remote branch 'remotes/origin/master'