fix #135
fix #130
Merge branch 'master' of github.com:OOKB/rg-client-app