Added feature #1.