Updated the code - more to come tomorrow
Merge pull request #6 from lisanmorrison/master

Updated the code - more to come tomorrow