2nd part of ia - incantation
Merge branch 'develop' of github.com:janteuni/Zappy into develop