commit
Merge remote-tracking branch 'upstream/master'
fix some problem
fix some problem
2014-8-9,jiangjin. add electric module
Merge pull request #4 from iamjinge/master

2014-8-9, jiangjin