Merge pull request #1104 from alex/use-numbers

Use numbers