More Testing
Merge pull request #29 from swndr/master

More Testing