Merge pull request #6 from tc28/master

merge
Merge pull request #4 from jsl15/master

Merge pull request #6 from tc28/master