Hierachy to latex
make sure images do not overlap
Merge remote-tracking branch 'upstream/master'