Update data
Update data
Update data
Fix bugs in #84 and #88