Merge pull request #1803 from Grazfather/typedef