typedef variable fixes
Merge pull request #22 from elenasa/master

typedef variable fixes