Hotfixes
Merge pull request #78 from gesa/dawnstar

Hotfixes