white numbers and upstream updates
Merge pull request #2 from IOAP/rebase

white numbers and upstream updates