Improve error output.
Fix include handler.
Update version.