Merge pull request #51 from abdulrauf/master

Bug fixes
Merge branch 'master' of https://github.com/Gluttonberg/core