diff --git a/CMakeLists.txt b/CMakeLists.txt
index 054d797eb..797d81d09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 project (TIGL)
 set(TIGL_VERSION_MAJOR 2)
 set(TIGL_VERSION_MINOR 0)
-set(TIGL_VERSION_PATCH 2+)
+set(TIGL_VERSION_PATCH 3)
 set(TIGL_VERSION "${TIGL_VERSION_MAJOR}.${TIGL_VERSION_MINOR}.${TIGL_VERSION_PATCH}")
 
 OPTION(ENABLE_COVERAGE "Enable GCov coverage analysis (defines a 'coverage' target and enforces static build of tigl)" ON)
diff --git a/ChangeLog b/ChangeLog
index 93c3da098..9ba31edda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+Version 2.0.3
+
+New API Functions:
+	-tiglWingGetIndex Returns the wing index given a wing UID
+	-tiglWingGetSegmentIndex Returns the segment index given a wing segment UID
+	-tiglWingGetComponentSegmentCount Returns the number of component segments for a specific wing (selected by wing index)
+	-tiglWingGetComponentSegmentIndex Translates component segment UID into component segment index
+	-tiglWingGetComponentSegmentUID Translates component segment index into component segment UID
+	
+Fixes:
+	-Fixed tiglWingComponentSegmentPointGetSegmentEtaXsi
+	-Fixed accuracy of CCPACSWingComponentSegment::getPoint and CCPACSWingSegment::getEta
+	-Fixed memory management handling of tiglWingGetProfileName
+	-Fixed memory leaks in VTK export and CCPACSFuselages
+	
+TIGLViewer:
+	-Menus are enabled/disabled depending on number of wings/fuselages
+	-Added close configuration menu entry
+	-improved view rotation with middle mouse button
+		
+-Added CCPACSWingSegment::GetChordPoint to internal API
+-Added a simple cpacs data set for accuracy testing
+-Added some accuracy tests for getPoint functions
+-Added support for visual leak detector
+-Changed UnitTesting? Framework to google-test
+-Changed tigl linking to static for unit tests
+-Added coverage with gcov (gcc only) to project
+
+
+
 Version 2.0.2
 
 -Fixed wing translation bug in TIGLViewer and export Functions
diff --git a/TIGLViewer/src/TIGLViewerWindow.cpp b/TIGLViewer/src/TIGLViewerWindow.cpp
index c99b83cd5..f9dc31864 100644
--- a/TIGLViewer/src/TIGLViewerWindow.cpp
+++ b/TIGLViewer/src/TIGLViewerWindow.cpp
@@ -56,6 +56,8 @@ void ShowOrigin ( Handle_AIS_InteractiveContext theContext )
 	AddVertex ( 0.0, 0.0, 0.0, theContext);
 }
 
+//@TODO: please enable lines in again, we disable the menu just for the release 2.0.3
+#if 0
 void TIGLViewerWindow::contextMenuEvent(QContextMenuEvent *event)
  {
      QMenu menu(this);
@@ -80,6 +82,7 @@ void TIGLViewerWindow::contextMenuEvent(QContextMenuEvent *event)
 
      menu.exec(event->globalPos());
  }
+#endif
 
 TIGLViewerWindow::TIGLViewerWindow()
 	: myLastFolder(tr(""))
@@ -119,6 +122,7 @@ TIGLViewerWindow::TIGLViewerWindow()
     QObject::connect(scriptInput, SIGNAL(textChanged(QString)), scriptEngine, SLOT(textChanged(QString)));
     QObject::connect(scriptInput, SIGNAL(returnPressed()), scriptEngine, SLOT(eval()));
     QObject::connect(scriptEngine, SIGNAL(printResults(QString)), console, SLOT(append(QString)));
+    scriptInput->setVisible(false);
 }
 
 TIGLViewerWindow::~TIGLViewerWindow(){
diff --git a/TIGLViewer/src/TIGLViewerWindow.h b/TIGLViewer/src/TIGLViewerWindow.h
index 93d215b26..0cd6ae798 100644
--- a/TIGLViewer/src/TIGLViewerWindow.h
+++ b/TIGLViewer/src/TIGLViewerWindow.h
@@ -57,8 +57,11 @@ class TIGLViewerWindow : public QMainWindow, private Ui::TIGLViewerWindow
 	// Displays a simple dialog for error messages
 	void displayErrorMessage (const QString aMessage, QString aHeader);
 
+//@todo remove ifdefs, just inserted for release 2.0.3
+#if 0
 protected:
      void contextMenuEvent(QContextMenuEvent *event);
+#endif
 
 public slots:
     void updateMenus(TiglCPACSConfigurationHandle);
diff --git a/TIGLViewer/src/TIGLViewerWindow.ui b/TIGLViewer/src/TIGLViewerWindow.ui
index 15a914f49..1ec52c487 100644
--- a/TIGLViewer/src/TIGLViewerWindow.ui
+++ b/TIGLViewer/src/TIGLViewerWindow.ui
@@ -49,7 +49,11 @@
      </widget>
     </item>
     <item>
-     <widget class="QLineEdit" name="scriptInput"/>
+     <widget class="QLineEdit" name="scriptInput">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -878,7 +882,10 @@
     <bool>true</bool>
    </property>
    <property name="checked">
-    <bool>true</bool>
+    <bool>false</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
    </property>
    <property name="text">
     <string>ScriptInput</string>
@@ -886,6 +893,9 @@
    <property name="shortcut">
     <string>Alt+S</string>
    </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
   </action>
   <action name="showWireframeAction">
    <property name="checkable">