Error-testing
Merge pull request #28 from ckolek/jeffDevelopment

Error-testing