Issue 94

closes #94