Merge pull request #16 from opencart-lite/dev

Dev
Merge pull request #17 from opencart-lite/core

Merge pull request #16 from opencart-lite/dev