Merge branch 'dev', remote-tracking branch 'upstream/dev' into dev
Fix controlleradapter config bug
Merge pull request #35 from hwchiu/core-config-fix

Load core config corretly