Feature/map in the header

close #12