Added feature request 1