Merge pull request #16 from btaidm/master

Server Viewer and defaults