Let's see if this works for #151.
Merge remote-tracking branch 'origin/master'