fixed issues #1 and #2 brought up by jfikar.
Merge branch 'release' of github.com:marcdegraef/CTEMsoft into release