Merge pull request #93 from shaunmcgeever/testing

Testing
Merge branch 'master' into testing