Issue:#905.  Thank you Daniel for the patch.

git-svn-id: svn://dev.exiv2.org/svn@3049 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3
Issue: #906

git-svn-id: svn://dev.exiv2.org/svn@3050 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3