Merge pull request #55 from RubyLouvre/master

update
Merge pull request #56 from RubyLouvre/master

update
Merge pull request #57 from RubyLouvre/master

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

update smartgrid