Fixed issue #37, ignore words
Merge branch 'origin/dev'