should finish #174, at least style wise
Merge branch 'master' of github.com:OOKB/rg-client-app