Merge pull request #1 from walshkvn/master

Latest changes made with chris on the master