Merge pull request #13 from gordonwoodhull/master

error handling and processing content