Make it possible to specify parent element
Merge branch 'dev'