diff --git a/Administrative/releaseFiles/release_notes.txt b/Administrative/releaseFiles/release_notes.txt
index 7aeb1db33..ee73d072b 100644
--- a/Administrative/releaseFiles/release_notes.txt
+++ b/Administrative/releaseFiles/release_notes.txt
@@ -1,6 +1,6 @@
 ===============================================================================
                             RELEASE NOTES : Kactus2
-				  Copyright (c) 2012-2019 Tampere University
+                  Copyright (c) 2012-2019 Tampere University
                             http://funbase.cs.tut.fi
 ===============================================================================
               + Improvement or feature added
@@ -8,6 +8,34 @@
               * Changed or Information
 ===============================================================================
 
+29/03/2019 3.7.0
+----------------------------------------------------
+
++ Added auto connector tool for component instances in a design
++ Added editor for Vendor Extensions in Component and Design
++ Added support for register files
++ Added support for multiple reset values for register fields
++ Added scrolling to design view when items are dragged
++ Improved memory map visualization and library loading performance
++ Improved expression parsing
+    * Added support for bitwise operations
+    * Improved expression solving performance
++ Improved VHDL and Verilog support
+    * Fixed array and vector boundary handling
+    * Include Verilog file parameters are imported
+    * Imported parameter type is set based on the data type in VHDL
++ Improved HW design editor to accept connections between extended bus definitions
+
+- Fixed an issue where removing an item in library did not remove the file on disk
+- Fixed an issue where removing items in memory maps would cause the application to crash
+- Fixed an issue where setting an empty bus interface mode would cause the application to crash
+- Fixed an issue where design active views were cleared on save
+- Fixed an issue where plugin details were incorrectly displayed in the settings
+- Fixed an issue where component instance parameter override was incorrectly displayed when
+  using parameter choices 
+- Fixed an issue where multiline description was not correctly CSV imported/exported
+
+
 29/06/2018 3.6.50
 ----------------------------------------------------
 
@@ -27,17 +55,17 @@
 + Added support for multiple abstraction definitions in a bus interface
 + Improvements to Memory Designer
     * Improved item scaling in non-compressed mode
-	* Improved search through hierarchies
-	* Improved visulization for multiple address spaces connected to one memory map
+    * Improved search through hierarchies
+    * Improved visulization for multiple address spaces connected to one memory map
 + Added feature to save HW, System and Memory Designer view as a PNG, JPG or SVG image
 + Improved expression parsing
-	* Support for exp, pow and sqrt functions
-	* Better suppport for string expressions and their comparison
-	* Faster parsing algorithm
+    * Support for exp, pow and sqrt functions
+    * Better suppport for string expressions and their comparison
+    * Faster parsing algorithm
 + Added Linux Device Tree Generator plugin
 + IP-XACT library handling improved for better performance and readability
 + HW and System design area size now adjusts to contents
-	
+
 - Restored automatic item selection in library view when component instance is selected
 - Fixed addressSpaceRef-attribute parsing and writing
 - Fixed export dialog from hierarchy view
diff --git a/Administrative/releaseFiles/setupx64.nsi b/Administrative/releaseFiles/setupx64.nsi
index e50f9d85b..6e0e67a9c 100644
--- a/Administrative/releaseFiles/setupx64.nsi
+++ b/Administrative/releaseFiles/setupx64.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Kactus2"
-!define PRODUCT_VERSION "3.6.114 64-bit"
+!define PRODUCT_VERSION "3.7.0 64-bit"
 !define PRODUCT_PUBLISHER "TUT"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Kactus2.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
diff --git a/library/HierarchyView/hierarchyitem.cpp b/library/HierarchyView/hierarchyitem.cpp
index e7eab8a79..ee33f9625 100644
--- a/library/HierarchyView/hierarchyitem.cpp
+++ b/library/HierarchyView/hierarchyitem.cpp
@@ -580,7 +580,7 @@ int HierarchyItem::countInstances(VLNV const& componentVLNV)
 bool HierarchyItem::hasChild(VLNV const& vlnv)
 {
     return std::find_if(childItems_.cbegin(), childItems_.cend(),
-        [&vlnv](auto& child) { return child->getVLNV() == vlnv; }) != childItems_.cend();
+        [&vlnv](HierarchyItem const* child) { return child->getVLNV() == vlnv; }) != childItems_.cend();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/version.h b/version.h
index c4fd4c745..1b6fa1700 100644
--- a/version.h
+++ b/version.h
@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL           3.6.833.0
+#define VERSION_FULL           3.7.0.0
 
 #define VERSION_BASEYEAR       0
-#define VERSION_DATE           "2019-03-28"
-#define VERSION_TIME           "14:53:53"
+#define VERSION_DATE           "2019-03-29"
+#define VERSION_TIME           "12:01:13"
 
 #define VERSION_MAJOR          3
-#define VERSION_MINOR          6
-#define VERSION_BUILDNO        833
+#define VERSION_MINOR          7
+#define VERSION_BUILDNO        0
 #define VERSION_EXTEND         0
 
-#define VERSION_FILE           3,6,833,0
-#define VERSION_PRODUCT        3,6,833,0
-#define VERSION_FILESTR        "3,6,833,0"
-#define VERSION_PRODUCTSTR     "3,6,833,0"
+#define VERSION_FILE           3,7,0,0
+#define VERSION_PRODUCT        3,7,0,0
+#define VERSION_FILESTR        "3,7,0,0"
+#define VERSION_PRODUCTSTR     "3,7,0,0"
 
 #endif