fix #16
Merge branch 'staging' into production