#44 Remiders corrected
Merge branch 'master' into production