Added support for five digit numbers