Change code to run in strict mode
Merge branch 'develop'