diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index d0398eb1..84171c79 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index 5ffed974..1ff005c9 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -142,6 +142,12 @@ namespace bsmd.ExcelReadService
             return true;
         }
 
+        internal static string CreateConfirmationSheet(MessageCore messageCore)
+        {
+            throw new NotImplementedException();
+        }
+
+
         #region ATA
 
         static void ScanATA(List<Message> messages, MessageCore messageCore, ExcelReader reader)
@@ -157,12 +163,7 @@ namespace bsmd.ExcelReadService
             Util.ScanMessage(ata, reader);
             if (!ata.ATAPortOfCall.HasValue && ataMessage.IsNew)
                 messages.Remove(ataMessage);
-        }
-
-        internal static string CreateConfirmationSheet(MessageCore messageCore)
-        {
-            throw new NotImplementedException();
-        }        
+        }           
 
         #endregion
 
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 493a3a02..3fe8b100 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.1.5")]
+[assembly: AssemblyInformationalVersion("3.1.6")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index 3718188b..19bb04ac 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.1.5.*")]
+[assembly: AssemblyVersion("3.1.6.*")]
 
diff --git a/nsw/Source/bsmd.email/BSMDMail.cs b/nsw/Source/bsmd.email/BSMDMail.cs
index 8fa6ece2..7f1ea3ea 100644
--- a/nsw/Source/bsmd.email/BSMDMail.cs
+++ b/nsw/Source/bsmd.email/BSMDMail.cs
@@ -100,17 +100,21 @@ namespace bsmd.email
             }
 
             // mailer.Send(message);
-
+            
+             /*
             mailer.client.SendCompleted += (s, e) =>
             {
                 log.InfoFormat("{0} email send completed", subject);
                 mailer.Dispose();
                 message.Dispose();
             };
+            */
 
             try
             {
-                mailer.client.SendAsync(message, null);
+                // Umgestellt auf synchron, da sonst die gesendeten Elemente nicht gelöscht werden können..
+                mailer.Send(message);
+                // mailer.client.SendAsync(message, null);
             }
             catch (SmtpException smtpException)
             {
diff --git a/nsw/Source/bsmd.herberg.FormService/Util.cs b/nsw/Source/bsmd.herberg.FormService/Util.cs
index 87eb1460..77e84830 100644
--- a/nsw/Source/bsmd.herberg.FormService/Util.cs
+++ b/nsw/Source/bsmd.herberg.FormService/Util.cs
@@ -826,7 +826,7 @@ namespace bsmd.herberg.FormService
                                         if (pDict.ContainsKey("CrewMemberNationalityCode")) crew.CrewMemberNationality = pDict["CrewMemberNationalityCode"];
                                         if ((crew.CrewMemberNationality != null) && (crew.CrewMemberNationality.Length > 2))
                                             crew.CrewMemberNationality = crew.CrewMemberNationality.Substring(0, 2);
-                                        if (pDict.ContainsKey("CrewMemberIdentityDocumentType")) crew.CrewMemberIdentityDocumentType = (byte)Enum.Parse(typeof(Enums.PassengerIdentityDocumentType), pDict["CrewMemberIdentityDocumentType"], true);
+                                        if (pDict.ContainsKey("CrewMemberIdentityDocumentType")) crew.CrewMemberIdentityDocumentType = Enums.ParseIdentityDocumentType(pDict["CrewMemberIdentityDocumentType"]);
                                         if (pDict.ContainsKey("CrewMemberIdentityDocumentId")) crew.CrewMemberIdentityDocumentId = pDict["CrewMemberIdentityDocumentId"];
                                         if (pDict.ContainsKey("CrewMemberVisaNumber")) crew.CrewMemberVisaNumber = pDict["CrewMemberVisaNumber"];
                                         if (pDict.ContainsKey("CrewMemberDuty")) crew.CrewMemberDuty = pDict["CrewMemberDuty"];
@@ -1006,7 +1006,7 @@ namespace bsmd.herberg.FormService
                                     if (lDict.ContainsKey("CargoGrossQuantity_TNE")) ladg.CargoGrossQuantity_TNE = Extensions.TryParseDouble(lDict["CargoGrossQuantity_TNE"]);
                                     if (lDict.ContainsKey("CargoNumberOfItems")) ladg.CargoNumberOfItems = Int32.Parse(lDict["CargoNumberOfItems"]);
                                     if (lDict.ContainsKey("CargoCodeNST")) ladg.CargoCodeNST = lDict["CargoCodeNST"];
-                                    if (lDict.ContainsKey("CargoHandlingType")) ladg.CargoHandlingType = (byte) Enum.Parse(typeof(Enums.CargoHandlingType), lDict["CargoHandlingType"]);
+                                    if (lDict.ContainsKey("CargoHandlingType")) ladg.CargoHandlingType = (byte) Enum.Parse(typeof(Enums.CargoHandlingType), lDict["CargoHandlingType"].ToUpper());
 
                                     saveMessages.Add(ladg);
                                 }