client extends observable
Merge origin/master