Merge pull request #37 from joeelsey/dev

Dev
Merge remote-tracking branch 'upstream/dev' into dev