Track column count explicitly
Use unsigned int to fix compiler warning
Merge pull request #64 from Nibbler999/master

 Track column count explicitly