Merge pull request #114 from glenwks/master

remove redundant codes