first commit
Merged changes