Work on naming - NO BuILD
Merge branch 'master' of https://github.com/MuseumTour/Zombit