added support for optional leading zero