Merge pull request #2 from jgoley/dev

Dev