Fixed issues with skipping, added validation - Issue #16