Merge branch 'feature/nginx-metrics' into 'master'

Nginx metrics support

See merge request !7