Merge branch 'nt2int_fix'
Merge branch 'master' of https://github.com/benjjneb/DADAC