Bug fix + ©
Merge branch 'develop'