Merge branch 'develop'
Fixed bug where lowercase numeral would not be parsed