Merge pull request #1 from walshkvn/master

Latest changes made with chris on the master
Merge pull request #4 from walshkvn/Kevin

Merge pull request #1 from walshkvn/master