Feature/nginx

Jo's PR #6 + Style improvements