Tweak my credits
Merge branch 'develop'