correct integer format errors
Merge branch 'release' of github.com:marcdegraef/CTEMsoft into release
last commit for Release 2.1