Merge branch 'master' into detail_type_list
Modify the aliases #82
Correct lint warnings #82
Avoid a compilation error with gcc 4.7 #82
Merge branch 'detail_type_list'