More testing
Merge pull request #5 from jameshaak/feature/testing

More testing