swk1992
Merge pull request #37 from swk1992/master

swk1992
Merge remote-tracking branch 'michaelliao/master'