Merge master into comparisons

Closes #5.