tutorial
Merge origin/master
Some bugs fixed
new power
new power
Merge origin/master