Merge pull request #563 from cshore/pull-request-app-uhttpd