Merge pull request #4 from wozz/master

Merge upstream
Add new default server