fixes bug #561
adds feature #560