Update to master 

hopefully I now made the request in the right direction.