Merge pull request #23 from raistlinthewiz/develop

More web-server work.