Merge pull request #1 from m-howard/master

1st merge