use cleanup handler
Merge pull request #18 from lnussel/cleanup

use cleanup handler