removing overengineering + rules on numbers

Not sure the specific number format was published mid-day of March 9, so my implementation was wrong, e.g. accepting +
Merge branch 'solution2'