Numbers shouldn't be strings
Merge pull request #607 from tuscanhobbit/dev

Numbers shouldn't be strings
Merge from master