Issue#231

closes issue #231