Master

bug fixes for issue #257