Merge pull request #29 from wendong112/master

clean up code