v0.7-BETA
Merge remote-tracking branch 'origin/master'