Stuart's modifications
Merge pull request #1 from stuartalexwhitehead/stu

I am excite