Code

Merge remote-tracking branch 'anarcat/autogen'