Issue #25 handle zero for id