Merge pull request #46 from HUSACCT/master

c5
Merge pull request #47 from HUSACCT/master

master merge
wrong to-class in method, parameter and inheritance generator fixes