fixing to default to 1
Merge branch 'master' into production