Fixed numbering
Merged with github master