Merge pull request #1 from polyphant1/master

update
Merge pull request #6 from roryhoulding/master

Merge pull request #1 from polyphant1/master