Looks like this one change is what's fixing bug #58, whereas the other changes in this commit are just adding support for an additional feature.  Am I right?