initial commit
Merge snapgen2/master