Updated for upstream version 0.10.4