Merge pull request #49 from saurabhrpi/master

Fix bug related to creating database tables
Fix variable names
Merge pull request #50 from pdpiech/master

Fix variable names