we're following the player again
Merge branch 'develop'