fix struct types
Merge pull request #16 from mlubin/master

fix struct types