Added more diagnostics
Updated version for next release
Updated files