More Testing
Merge pull request #8 from swndr/master

More Testing