bug fixed in test_toy_corpus
Merge branch 'master' into develop