id added
SimplePower add ID
Merge branch 'SimplePower-master'