Issue #20 Add support for <skip>