Merge pull request #374 from mirage/master

cstruct update
Merge pull request #375 from mirage/master

mirage updates
Merge pull request #376 from mirage/master

fix 4.00.1 switch for short types