Merge branch 'dev'
fix un-exported function
Merge branch 'master' of https://github.com/bxshi/rdsg