remove duplicate typedef
Merge branch '0.3'