Merge pull request #17 from richard-green/development

Enhanced error messages