updates #45

See #45 for the the original pull request this is fixing.