Fixing merge conflicts created by my recent PR to master (#70)

We should merge your branch into master as soon as it's able to be auto-merged