Merge pull request #3 from h-taylor/master

Updates from Hayden
Merge pull request #3 from svetzal/master

Merge pull request #3 from h-taylor/master