attempting to fix unicode encode issue
Merge branch 'develop'