BUG cleaning up temporary files for #398
Merge pull request #492 from sjsrey/b398

BUG cleaning up temporary files for #398