Updated this in the work1 branch
added some more lines
added line 3
Merged with master
Merge branch 'work1'