Ours commit
Merge pull request #2 from clarkbremer/ours

Ours commit