Merge branch 'develop'
Merge branch 'develop'
updated to remove testing logic
Merge branch 'master' into develop