Initial commit
Merge https://github.com/michaljaworski/isoengine-1.6