Committing improved backend
Merge pull request #97 from jay-github/master

Committing improved backend