Last TODO removed. Close #89.