Merge pull request #22 from cristiroma/master

Updated production settings