diff --git a/app/localize/start.h b/app/localize/start.h
index 8a8d8c40..69bba4e5 100644
--- a/app/localize/start.h
+++ b/app/localize/start.h
@@ -94,9 +94,13 @@
 #endif
 /******************************************************************************/
 #define TXTARCH        TXTCPU TXTFPU TXTTEST
-#define TXTDOSVERSION  "\0$VER: amath 1.60 (07-04-2016)" SPACE TXTARCH
-#define TXTTITLE       "amath version 1.6.0"
+#define RELDATESTAMP   "(10-01-2017)"
+#define TXTDOSVERSION  "\0$VER: amath 1.61" SPACE RELDATESTAMP SPACE TXTARCH
+#define TXTTITLE       "amath version 1.6.1"
 #define TXTCOPYRIGHT   "(c) 2016 Carsten Sonne Larsen"
 #define TXTSTARTMSG    TXTTITLE SPACE TXTCOPYRIGHT
 /******************************************************************************/
+#define TXTVERSMSG     TXTTITLE SPACE RELDATESTAMP SPACE TXTARCH
+#define TXTCOMPMSG     "Compiled with " COMP_NAME SPACE COMP_VERS
+/******************************************************************************/
 #endif
diff --git a/app/main/statements.cpp b/app/main/statements.cpp
index 59a6dd3b..4d25a248 100644
--- a/app/main/statements.cpp
+++ b/app/main/statements.cpp
@@ -75,10 +75,16 @@ char* VersionStatement::Execute()
     output->Empty();
     output->EnsureSize(
         StrLen(BOLD) +
-        StrLen(TXTSTARTMSG) +
-        StrLen(NEWLINE));
+        StrLen(TXTVERSMSG) +
+        StrLen(NEWLINE) * 2 +
+        StrLen(NORMALTEXT) +
+        StrLen(TXTCOMPMSG));
+
     output->Append(BOLD);
-    output->Append(TXTSTARTMSG);
+    output->Append(TXTVERSMSG);
+    output->Append(NORMALTEXT);
+    output->Append(NEWLINE);
+    output->Append(TXTCOMPMSG);
     output->Append(NEWLINE);
 
     return output->GetString();
diff --git a/lib/platform.h b/lib/platform.h
index 576479a7..864f07f5 100644
--- a/lib/platform.h
+++ b/lib/platform.h
@@ -32,6 +32,7 @@
 
 #define EMPTYSTRING ""
 #define SPACE       " "
+#define DOT         "."
 
 #ifdef _WIN32
 #define NEWLINE     "\r\n"
@@ -181,6 +182,68 @@ inline void  operator delete[] (void* ptr) throw() {
 #endif
 #endif
 
+/**
+ * @brief
+ * https://sourceforge.net/p/predef/wiki/Compilers/
+ */
+
+#if defined(__clang__)
+/* Clang */
+# if defined(__apple_build_version__)
+#  define COMP_NAME      "XCode Clang"
+# else
+#  define COMP_NAME      "Clang/LLVM"
+# endif
+# define str(x)          #x
+# define CL_VER_STR(x)   str(x)
+# ifdef __clang_patchlevel__
+#  define COMP_VERS      CL_VER_STR(__clang_major__) DOT \
+                         CL_VER_STR(__clang_minor__) DOT \
+                         CL_VER_STR(__clang_patchlevel__)
+# else
+#  define COMP_VERS      CL_VER_STR(__clang_major__) DOT \
+                         CL_VER_STR(__clang_minor__)
+# endif
+/* Intel ICC/ICPC */
+#elif defined(__ECC) || defined(__ICC) || defined(__INTEL_COMPILER)
+# define COMP_NAME       "Intel ICC/ICPC"
+# define COMP_VERS       __VERSION__
+/* IBM XL C/C++ */
+#elif defined(__IBMC__) || defined(__IBMCPP__)
+# define COMP_NAME       "IBM XL"
+# define COMP_VERS       __xlc__
+/* Microsoft Visual Studio */
+#elif defined(_MSC_VER)
+# define COMP_NAME       "Microsoft Visual Studio"
+# define str(x)          #x
+# define MSC_VER_STR(x)  str(x)
+# define COMP_VERS       MSC_VER_STR(_MSC_VER / 100)
+/* Portland Group PGCC/PGCPP */
+#elif defined(__PGI)
+# define COMP_NAME       "PGCC/PGCPP"
+# define str(x)          #x
+# define PGCC_VER_STR(x) str(x)
+# ifdef __PGIC_PATCHLEVEL__
+#  define COMP_VERS      PGCC_VER_STR(__PGIC__) DOT \
+                         PGCC_VER_STR(__PGIC_MINOR) DOT \
+                         PGCC_VER_STR(__PGIC_PATCHLEVEL__)
+# else
+#  define COMP_VERS      PGCC_VER_STR(__PGIC__) DOT \
+                         PGCC_VER_STR(__PGIC_MINOR)
+# endif
+/* GNU GCC/G++ */
+#elif defined(__GNUC__) || defined(__GNUG__)
+# define COMP_NAME       "GCC"
+# define str(x)          #x
+# define GCC_VER_STR(x)  str(x)
+# ifdef __GNUC_PATCHLEVEL__
+#  define COMP_VERS      GCC_VER_STR(__GNUC__) DOT GCC_VER_STR(__GNUC_MINOR__) DOT \
+                         GCC_VER_STR(__GNUC_PATCHLEVEL__)
+# else
+#  define COMP_VERS      GCC_VER_STR(__GNUC__) DOT GCC_VER_STR(__GNUC_MINOR__)
+# endif
+#endif
+
 #if defined(ANSICONSOLE)
 #define HEADLINE         "\x1B[1m"
 #ifdef UNIX