multiple server support
Merge branch 'master' of github.com:Forekasting/kiwi