Merge pull request #284 from rickcarlino/master

Hotfix / production release November 2nd