Feature/update and add more feature

Merge with parent. And also added features from https://github.com/tas50/nagios/pull/239