Resolving merge conflicts caused by pull #28

These commits are to resolve the merge conflicts caused by pull request #28.