Merge pull request #6 from stefan-wuensch/master

Broke Alarms and Topics into different files.
Merge remote-tracking branch 'upstream/master'