Merge remote-tracking branch 'JGjorgji/fix-leading-zeroes'