Issue78

closes #78