First step to solve issue 17

https://github.com/sebastien/monitoring/issues/17