diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 06dfe37bb8..74ca591951 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -259,7 +259,10 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
                 } else {
                     $imageSource = "zip://{$this->docFile}#{$target}";
                 }
-                $parent->addImage($imageSource);
+                $extension = pathinfo($imageSource, PATHINFO_EXTENSION);
+                if($extension !== 'emf' && $extension !== 'wmf') { //windows OS specific images
+                    $parent->addImage($imageSource);
+                }
             }
         } elseif ($node->nodeName == 'w:drawing') {
             // Office 2011 Image
@@ -277,7 +280,11 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
             $target = $this->getMediaTarget($docPart, $embedId);
             if (!is_null($target)) {
                 $imageSource = "zip://{$this->docFile}#{$target}";
-                $parent->addImage($imageSource, null, false, $name);
+                $extension = pathinfo($imageSource, PATHINFO_EXTENSION);
+                if($extension !== 'emf' && $extension !== 'wmf') { //windows OS specific images
+                    $parent->addImage($imageSource, null, false, $name);
+                }
+                
             }
         } elseif ($node->nodeName == 'w:object') {
             // Object
diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index 18ef88975f..7b2de51e07 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -228,6 +228,10 @@ public function getBidirectional()
      */
     private function validateLocale($locale)
     {
+        if ($locale !== null) {
+            $locale = str_replace('_', '-', $locale);
+        }
+
         if (strlen($locale) === 2) {
             return strtolower($locale) . '-' . strtoupper($locale);
         }