Relaxed rules on number formatting for #84. Implemented #86