Correct comments #28
Merge branch 'type_list'