Merge pull request #1 from thangskyline/master_thangma

Master thangma
asd
asdf
asdfasdf