Merge class/struct code
Merge pull request #9 from r-e-d/master

Merge class/struct code