new files added
Comments added at top
Merge branches 'dev' and 'master'