Better support for COMMIT files

Update #72