Some changes
Merge remote-tracking branch 'origin/master'
Merge pull request #4 from johnb30/master

Updates from Andy