Minor changes
Fixed additives regex
Merge branch 'development' of github.com:monstermunchkin/mensa into development