Merge JETTO integrated version into master branch #22

Closed Karel-van-de-Plassche closed 7 years ago