I168

closes #168