Added word count
Merge branch 'yazinsai-master' (closes #6)