Merge pull request #1 from asaaki/hotfix/server-argument-count

Fix if statement for argument count
Merge branch 'master' into stage