Merge pull request #29 from kakulisen/master

SCB-1486 Fix bug that generated public class name is inconsistent wit…