parentId added
Merge branch 'master' of github.com:szym1991/isi-hakaton-1