Solve performance problem when wait for incoming messages
Merge branch 'master' of https://github.com/hkaj/IA04