Fixes to issues omitted while active record migration
Merge pull request #8 from shalabhaggarwal/develop

Fixes to issues omitted while active record migration