Made changes as per Katria's instructions
Merge branch 'master' of github.com:jmejia/store_engine