fix recursion error
Merge branch 'master' of github.com:downloadam/client
multihoster fixes