Merge pull request #104 from bhavyakjain/master

Fix arguments to skip_on_empty helper