some bugs solved.
Merge branch 'master' of https://github.com/Romenig/ivp2java.git