Merge pull request #54 from RubyLouvre/master

update
update smartgrid
Merge pull request #267 from shirlyLoveU/master

update smartgrid