Added comments
Merged files