uploading John's changes
Merge pull request #8 from jkuk/master

There are john's changes