Merge pull request #19 from shanswami/develop

Fixes merge conflicts in Develop and Package.json