Add support for skip handling

Fixes #19