Updated service
Updated server js
Merge pull request #4 from horaceheaven/func-test

Func test