Issue 77

closes #77