Think that should fix the ntz bugs.
Merge branch 'issue-19' into develop