Merge pull request #1 from verneroberts/master

Merging in Verne's changes to push to live