Change API to be more intuitive
Merge pull request #2 from maddenpj/add_server

Change API to be more intuitive