add keywords
don't break error handlers; bump 0.2.4; fixes #3
merge patch