Closing #70