Merge pull request #2 from r-e-d/master

Various fixes
Merge remote-tracking branch 'upstream/master'
Handle class/struct with attributes.