Merge pull request #4 from jgoley/dev

Dev
Merge pull request #5 from jgoley/dev

Dev