Merge branch 'master' into taglib2

To incorporate the pull request #209.