fix #43
Merge branch 'staging' into production