First steps to apply Async pattern
Merge remote-tracking branch 'origin/pele' into mazanuj