Updated for ECodeigniter Template Framework use
Merge branch 'release-1.0.1'