Merge branch 'develop' of https://github.com/Snailsoft/Hatch into develop