Use RcWuala and Config
Merge branch 'master' into dev