Bug fixex client
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp