Use config array instead of CI instance
Merge branch 'hotfix/0.1.0.1'