sjmgarnier Merge pull request #16 from noamross/zero-length