Merge branch 'develop'
Bug fix
Updated npm keywords
Merge remote-tracking branch 'origin' into develop