Added default port
Merge branch 'master' into retry-policy-#5
Added retry count.. and async :) #5