Merge branch 'develop'
Added test command to package.json