Updated to remove warning
Merge branch 'develop'