Merge pull request #3 from adamdriscoll/dev

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