Merge pull request #7 from samuelfrench/master

copying
Merge pull request #9 from samuelfrench/testing

Merge pull request #7 from samuelfrench/master