Merge branch 'dev'
Merge branch 'dev'
stopwords
minor tweaks
minor tweaks
Merge branch 'master' into dev