first version of testing
Merge pull request #8 from brendam/master

first version of testing