Tried to get addHost function to work, not yet :(
Merge branch 'master' of github.com:dinox/amazonaws