commit
SimplePower done
Merge branch 'SimplePower-master'