diff --git a/client/src/main.cpp b/client/src/main.cpp
index fa69603b..3b2a031d 100644
--- a/client/src/main.cpp
+++ b/client/src/main.cpp
@@ -23,6 +23,7 @@
 #include <QApplication>
 #ifdef Q_OS_WINDOWS
   #include <QSettings>
+  #include <QStandardPaths>
 #endif
 #include "mainwindow.hpp"
 //#include "network/client.hpp"
@@ -37,7 +38,7 @@ int main(int argc, char* argv[])
   QApplication::setOrganizationName("Traintastic");
   QApplication::setOrganizationDomain("traintastic.org");
   QApplication::setApplicationName("traintastic-client");
-  QApplication::setApplicationVersion("0.1.0");
+  QApplication::setApplicationVersion("0.0.1");
 
 #ifdef Q_OS_WINDOWS
   QSettings::setDefaultFormat(QSettings::IniFormat);
@@ -48,8 +49,12 @@ int main(int argc, char* argv[])
   //Client client;
   //Client::instance = &client;
 
-  Locale::instance = new Locale("/home/reinder/Dropbox/traintastic/traintastic/lang/en-us.txt");
-
+#ifdef Q_OS_WINDOWS
+  QString localePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "traintastic\\client\\lang", QStandardPaths::LocateDirectory);
+#else
+  QString localePath = "/home/reinder/Dropbox/traintastic/traintastic/lang";
+#endif
+  Locale::instance = new Locale(localePath.toStdString() + "/en-us.txt");
 
   MainWindow mw;
   mw.show();
diff --git a/package/innosetup/traintastic.iss b/package/innosetup/traintastic.iss
index 308fc59f..89046eb3 100644
--- a/package/innosetup/traintastic.iss
+++ b/package/innosetup/traintastic.iss
@@ -1,7 +1,10 @@
 ; Inno Setup Script for Traintastic
 
 #define Name "Traintastic"
-#define Version "0.1.0"
+#define Version "0.0.1"
+#ifndef Codename
+  #define Codename "master"
+#endif
 #define Publisher "Reinder Feenstra"
 #define URL "https://traintastic.org"
 #define ServerExeName "traintastic-server.exe"
@@ -11,7 +14,7 @@
 AppId={{7E509202-257F-4859-B8FA-D87D636342BB}
 AppName={#Name}
 AppVersion={#Version}
-AppVerName={#Name} v{#Version}
+AppVerName={#Name} v{#Version} {#Codename}
 AppPublisher={#Publisher}
 AppPublisherURL={#URL}
 AppSupportURL={#URL}
@@ -21,7 +24,7 @@ DisableDirPage=yes
 DisableProgramGroupPage=yes
 LicenseFile=..\..\LICENSE
 OutputDir=output
-OutputBaseFilename=traintastic-setup-{#Version}
+OutputBaseFilename=traintastic-setup-{#Version}-{#Codename}
 SolidCompression=yes
 WizardStyle=modern
 ArchitecturesInstallIn64BitMode=x64
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 3d835375..20fcd4ba 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.9)
-project(traintastic-server VERSION 0.1.0 DESCRIPTION "Traintastic server")
+project(traintastic-server VERSION 0.0.1 DESCRIPTION "Traintastic server")
 include(GNUInstallDirs)
 
 add_executable(traintastic-server src/main.cpp src/options.hpp)
diff --git a/server/src/options.hpp b/server/src/options.hpp
index ba90d351..d5aaa548 100644
--- a/server/src/options.hpp
+++ b/server/src/options.hpp
@@ -25,6 +25,7 @@
 
 #include <boost/program_options.hpp>
 #include <boost/preprocessor/stringize.hpp>
+#include <codename.hpp>
 
 struct Options
 {
@@ -66,7 +67,7 @@ struct Options
 
       if(vm.count("version"))
       {
-        std::cout << BOOST_PP_STRINGIZE(VERSION) << std::endl;
+        std::cout << BOOST_PP_STRINGIZE(VERSION) << " " << TRAINTASTIC_CODENAME << std::endl;
         exit(EXIT_SUCCESS);
       }
 
diff --git a/shared/src/codename.hpp b/shared/src/codename.hpp
index bd0e5ff8..46d2a5d5 100644
--- a/shared/src/codename.hpp
+++ b/shared/src/codename.hpp
@@ -23,6 +23,8 @@
 #ifndef TRAINTASTIC_SHARED_CODENAME_HPP
 #define TRAINTASTIC_SHARED_CODENAME_HPP
 
-#define TRAINTASTIC_CODENAME "Amsterdam CS"
+#ifndef TRAINTASTIC_CODENAME
+  #define TRAINTASTIC_CODENAME "master"
+#endif
 
 #endif