Gitub pull request #89 and #93: t+
Gitub pull request #89 and #93: t+

Hand-patch fix to merge conflict resolution between these two
github issues.

jeffreykegler/libmarpa,jeffreykegler/libmarpa,jeffreykegler/kollos,pczarn/kollos,jeffreykegler/libmarpa,pczarn/kollos,pczarn/kollos,jeffreykegler/kollos,pczarn/kollos,jeffreykegler/libmarpa,jeffreykegler/kollos,jeffreykegler/kollos,jeffreykegler/libmarpa,pczarn/kollos,jeffreykegler/kollos