Added labels
Merge branch 'develop' of https://github.com/izzappel/boom into develop