Update to master and implement get_header()