updated implementation
minor fixes
changes related to fields without id
Merge pull request #1 from dmiskiew/iiwo

Iiwo