Fix issue #22
Merge pull request #23 from ricardofbarros/master

Issue with number handlers