Added feature request from Emanuel