oops
Merge pull request #2 from supernullset/sjw/plusplus

oops