Patch for #103 based upon d39dc42