Fix issue 86

Not sure why this PR is including @apsoto's last two commits, which are appearing in my local copy of `master` but not on github's....