Reintroduced wordcount (fixes #30)