Merge branch 'pippijn-master'
Merge branch 'master' of https://github.com/sonOfRa/tox4j
Update the type for fileNumber in the callbacks.