YOLO we are so awesome
Merge branch 'develop' of https://github.com/janteuni/Zappy into develop