sync with live nagios
Merge pull request #1 from alierak/master

Nagios sync