Closes #71, but not very gracefully
Merge remote-tracking branch 'origin/master'