Merge pull request #3 from h-taylor/master

Updates from Hayden