Merge pull request #3 from jgoley/dev

Dev merge
Merge branch 'master' into dev