Merge pull request #66 from bangpound/master

Fix fatal error in cleanup command.