fix #120 and #121

for now anyway
Merge branch 'master' of github.com:OOKB/rg-client-app