struggling with #53
Merge branch 'master' of github.com:OOKB/rg-client-app
finish #53