The rest of the fix for issue #22; it helps if you add all the files before you commit