diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84ca6af5..49fef5ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,7 @@ IF(WIN32)
 
   SET(CPACK_GENERATOR "NSIS;ZIP")
   SET(CPACK_SOURCE_GENERATOR "ZIP")
-  SET(CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+  SET(CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME}")
   #SET(ICON_PATH "${PROJECT_SOURCE_DIR}/app/src/${PROJECT_NAME}.ico")
   #SET(CPACK_NSIS_MUI_ICON ${ICON_PATH})
   #SET(CPACK_NSIS_MUI_UNIICON ${ICON_PATH})
@@ -99,6 +99,7 @@ IF(WIN32)
   #SET(CPACK_NSIS_INSTALLED_ICON_NAME bin\\\\${PROJECT_NAME}.exe)
   SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}" ${CPACK_PACKAGE_EXECUTABLES}) 
   SET(CPACK_CREATE_DESKTOP_LINKS "${PROJECT_NAME}" ${CPACK_CREATE_DESKTOP_LINKS}) 
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
 ELSEIF(APPLE)
   IF(BUILD_AS_BUNDLE)
     # On APPLE and if BUILD_AS_BUNDLE=ON, the project is created as a bundle 
diff --git a/src/Object.cpp b/src/Object.cpp
index 563b93ff..d8c90fcf 100644
--- a/src/Object.cpp
+++ b/src/Object.cpp
@@ -383,10 +383,7 @@ void Object::contextMenuEvent(QContextMenuEvent * event)
 		QString text;
 		if(_savedFileName.isEmpty())
 		{
-#ifndef WIN32
-			_savedFileName = QDir::homePath();
-#endif
-			_savedFileName+="/figure.png";
+			_savedFileName=QDir::homePath()+"/figure.png";
 		}
 		text = QFileDialog::getSaveFileName(this, tr("Save figure to ..."), _savedFileName, "*.png *.xpm *.jpg *.pdf");
 		if(!text.isEmpty())