fix #7
Merge branch 'staging'