Merge branch 'pippijn-master'
Fix parameter types for file number function