awesome fixes from dougals
:i
Merge github.com:caoabunga/RemoteClientAOA