Merge pull request #1 from neb636/master

Adding in Joh's changes into master