Merge pull request #38 from nordquant/production