fix iva (issue #3989) + conventions
Merge branch 'master' of github.com:domthu/13fismine