cleaning up
Merge pull request #2 from lj50036/master

cleaning up