Merge pull request #92 from paulyi326/dev

[Fix] changed token to serverToken
[Fix] fixed serverToken bug