Resolving conflicts with pull request #32