Merge pull request #43 from coderanger/master

Fixes for nginx.