Add skip option - Fixes #16