I158

closes #157 and #158