Fixes #35.  Also changed the extension of the output files from  to