Fixed fatal typo
Merge branch 'develop' into issue3