Added testing
Added testing
Merge pull request #29 from loringdodge/master

Added testing