Merge remote-tracking branch 'origin/master'
Closes #6.