Merge pull request #2 from elelpublic/master

Merge pull request #7 from CreativeDream/master
Update for ServerSide-Render
Merge pull request #8 from CreativeDream/master

Update