Merge pull request #76 from RubyLouvre/master

Merge pull request #297 from shirlyLoveU/master
update smartgrid
Merge pull request #300 from shirlyLoveU/master

update smartgrid
Merge pull request #6 from RubyLouvre/master

合并原作者更新