Fixed #104, minor text update
Fixed #104
Merge branch 'develop' into staging
Merge branch 'staging' into production