Change to affect basic structure
Merging pull from git