Merge branch 'development'
Added new status function to use with nagios
Merge branch 'master' into development