Number data is now reimplemented
Merge remote-tracking branch 'origin'