Merge branch 'master' into taglib2

To incorporate the pull request #209 to fix the problem reported in #208.