testing suite
Merge branch 'master' into testing
addition of testing suite
Merge pull request #13 from FilWisher/testing

Testing