Merge pull request #1 from Josiastech/master

Update demo.
Merge pull request #2 from Josiastech/ServerSide

Merge pull request #1 from Josiastech/master