Fix #66 try 3

@cfoelmann I think I get rebase now. Couldn't get it to work right since when I rebased locally I was 7 commits ahead of remote, and so I couldn't push back. So, I branched my fork, rebased and pushed that fork and am basing this PR off of that branch. It's all in one commit now.