manually applying the changes in #60. This also closes #60. Thanks, John.