Merge pull request #15 from 54wang17/master

Master