merge + added improved rest and wordcount plugin