Merge pull request #527 from andreaturli/0.5.0-M1

fix for ngnix on os x