Related to Issue #307
Fix typo
Merge branch 'pr/308' into develop