Merge remote-tracking branch 'origin/master'
0.7.0.0 init