Added feature #576