Merge pull request #9 from aluebs/alarm

A lot of stuff