Added alarms to line.
Merge branch 'master' of https://github.com/ZackC/ZedPump