Minor refactor
Merge pull request #127 from jerv13/master

Minor refactor
Merge remote-tracking branch 'upstream/master' into RELEASE-production