Merge branch 'gramakri-nginx_config', closes #49