add architecture illustration
coverage++
fix race condition with the concurrent decorator
Merge branch 'master' into issue_341
Merge branch 'issue_341' into server_change_api