Fixed type (Fixes #188)
Merge remote-tracking branch 'origin/production'