Merge pull request #19 from roselone/master

client-web 1.0
Merge pull request #20 from roselone/master

update
Merge pull request #52 from purejade/master

update