Issue/#238

closes #238