Merge pull request #12 from wjdix/master

Compose a server from parts