Merge pull request #95 from sebix/cherokee-webserver