Issue#231

closes #231