Added wordIdx to message
Merge branch 'master' into interactive