My updates
Merge pull request #4 from dbthorpe/master

My updates