Commit from Thomas

This is a must-have feature!