First commit
Merge GitHub auto-gen stuff