Completed tasks 6 & 7 of assigment3
Merge pull request #106 from vktrsm/master
Merge commit '8abcbe5f7f459689ce54a2c52fa961bf4ad56be4'