Merge pull request #35 from nordquant/production