Improved the handling of numeric default values.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
Merge pull request #363 from ddobrev/master

Improved the handling of numeric default values