Merge pull request #50 from benwaugh/master

Outline of testing section