Merged in Sentinel 0.1.2, overriding default layout