fixes #259; fixes #257
merge