Squashed version of #278

`git` is still confusing to me, so I created this alternate merged branch for #278. Nothing new here. Please ignore.