Added feature #572