Merge pull request #3 from jsl15/master

updates on sunday evening
evening
Merge pull request #6 from tc28/master

merge