Added utf-8 as coding
Merge branch 'develop'