Issue#260

closes #243, closes #260