Spotlights and Markers
Merge branch 'master' of https://github.com/barthuisman/KIS