Merge pull request #1 from m-howard/master

1st merge
Merge pull request #2 from m-howard/development

Merge pull request #1 from m-howard/master