Fixed minor typos
Merge branch 'develop' into release/v1.0.0