Closes # 87