Fixes #1.
Merge branch 'develop' of https://github.com/dreid93/diglett-4477 into develop