fixed something --Yngve
Merge branch 'master' of https://github.com/ultralaserdeluxe/gloria
Merge branch 'master' of https://github.com/ultralaserdeluxe/gloria