Initial commit
Merged changes