init generator
Merge commit 'caf59558f2c34e64202f6522a8349d184ac39f09'