Spellcheck adaptation
Merge branch 'develop'