Merge pull request #31 from gravitystorm/errors