Fix plugin generator - close #42