Merge pull request #4 from RickyShi/master

Merge Test
Merge pull request #2 from MUSensingLab/master

Merge pull request #4 from RickyShi/master