diff --git a/README.md b/README.md
index 45d5457..4724fa0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Summary
+## Summary
 
 A Windows desktop tool for recording time spent on different Jira tasks.
 
@@ -17,7 +17,7 @@ A Windows desktop tool for recording time spent on different Jira tasks.
 
 * Select issue keys from a list based on one of your favorite JQL filters or type it manually
 * Displays issue description when key has been selected or entered manually
-* Post spent time into Jira as a worklog with comment
+* Post spent time into Jira as a worklog with comments
 
 ### Automatically save program state on exit
 
@@ -72,11 +72,25 @@ All icons on buttons were downloaded from [Icons8](https://icons8.com).
 ## Changelog
 
 <pre>
+1.6.0     2016-04-09     New features:
+                           - Allow multiple timers to run at the same time
+                           - Choose if worklog text should be posted on worklog track or comment track
+                           - Display total time in bottom of window
+
+                         Bugfixes:
+                          - Issue description was not updated when manually typing an issue key or deleting a key
+                          - notifyIcon is not available on Mono, so on non-Windows platforms, disable all minimze-to-tray code
+                          - Fixed thread UI issue
+
+                         Remade project structure to make crossplatform building easier
+
+                         Refactoring of internal Jira communication (including NUnit test-coverage)
+
 1.5.0     2016-02-07     Option for pausing timer when locking your PC (eg. for lunch breaks)
 
                          Application can now be minimized to the system tray
 
-                         Several bugfixes - for details see the [commit history](https://github.com/carstengehling/jirastopwatch/compare/1.4.1...58c9570)
+                         Several bugfixes - for details see the commit history
 
 1.4.1     2016-01-02     Added About dialog
 
diff --git a/source/StopWatch/Properties/AssemblyInfo.cs b/source/StopWatch/Properties/AssemblyInfo.cs
index 157f365..445a316 100644
--- a/source/StopWatch/Properties/AssemblyInfo.cs
+++ b/source/StopWatch/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 
 [assembly:InternalsVisibleTo("StopWatchTest")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file
diff --git a/source/StopWatchSetup/StopWatchSetup.vdproj b/source/StopWatchSetup/StopWatchSetup.vdproj
index af61f3c..fc575ad 100644
--- a/source/StopWatchSetup/StopWatchSetup.vdproj
+++ b/source/StopWatchSetup/StopWatchSetup.vdproj
@@ -21,20 +21,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_50F3BB70243F4243B4B1324E58EFC858"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_4456F9FE256FA4FD420275E14F48B8E7"
+        "OwnerKey" = "8:_50F3BB70243F4243B4B1324E58EFC858"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8D5C3054825D40A88DA392D9AC114DF1"
+        "MsmKey" = "8:_50F3BB70243F4243B4B1324E58EFC858"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_92559A03EFE2A5AC65485EFE742DBB15"
-        "OwnerKey" = "8:_50F3BB70243F4243B4B1324E58EFC858"
+        "MsmKey" = "8:_8D5C3054825D40A88DA392D9AC114DF1"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -46,7 +46,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_92559A03EFE2A5AC65485EFE742DBB15"
+        "OwnerKey" = "8:_4456F9FE256FA4FD420275E14F48B8E7"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -149,7 +149,7 @@
             "SourcePath" = "8:..\\StopWatch\\bin\\Release\\StopWatch.exe.config"
             "TargetName" = "8:StopWatch.exe.config"
             "Tag" = "8:"
-            "Folder" = "8:_BF4C33620F224C9E808A3CECFF38C4DD"
+            "Folder" = "8:_B2FCC0FC0E354BDE9A303C416C74C073"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -164,23 +164,23 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_50F3BB70243F4243B4B1324E58EFC858"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4456F9FE256FA4FD420275E14F48B8E7"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:StopWatch, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_50F3BB70243F4243B4B1324E58EFC858"
+                    "_4456F9FE256FA4FD420275E14F48B8E7"
                     {
-                    "Name" = "8:StopWatch.exe"
+                    "Name" = "8:RestSharp.DLL"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:..\\StopWatch\\bin\\Release\\StopWatch.exe"
+            "SourcePath" = "8:RestSharp.DLL"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_BF4C33620F224C9E808A3CECFF38C4DD"
+            "Folder" = "8:_B2FCC0FC0E354BDE9A303C416C74C073"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -192,15 +192,26 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8D5C3054825D40A88DA392D9AC114DF1"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_50F3BB70243F4243B4B1324E58EFC858"
             {
-            "SourcePath" = "8:..\\..\\LICENSE.txt"
-            "TargetName" = "8:LICENSE.txt"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:StopWatch, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_50F3BB70243F4243B4B1324E58EFC858"
+                    {
+                    "Name" = "8:StopWatch.exe"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:..\\StopWatch\\bin\\Release\\StopWatch.exe"
+            "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_BF4C33620F224C9E808A3CECFF38C4DD"
+            "Folder" = "8:_B2FCC0FC0E354BDE9A303C416C74C073"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -215,18 +226,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_92559A03EFE2A5AC65485EFE742DBB15"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8D5C3054825D40A88DA392D9AC114DF1"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                }
-            "SourcePath" = "8:RestSharp.DLL"
-            "TargetName" = "8:"
+            "SourcePath" = "8:..\\..\\LICENSE.txt"
+            "TargetName" = "8:LICENSE.txt"
             "Tag" = "8:"
-            "Folder" = "8:_BF4C33620F224C9E808A3CECFF38C4DD"
+            "Folder" = "8:_B2FCC0FC0E354BDE9A303C416C74C073"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -238,7 +243,7 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
         }
@@ -290,17 +295,6 @@
             "Property" = "8:TARGETDIR"
                 "Folders"
                 {
-                    "{9EF0B969-E518-4E46-987F-47570745A589}:_BF4C33620F224C9E808A3CECFF38C4DD"
-                    {
-                    "Name" = "8:Jira StopWatch"
-                    "AlwaysCreate" = "11:FALSE"
-                    "Condition" = "8:"
-                    "Transitive" = "11:FALSE"
-                    "Property" = "8:_5B0FE53736474898BE40EE1D1508A9A3"
-                        "Folders"
-                        {
-                        }
-                    }
                 }
             }
         }
@@ -319,15 +313,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Jira StopWatch"
-        "ProductCode" = "8:{A87EE1B8-2BE8-4CCF-A277-11B386A110EB}"
-        "PackageCode" = "8:{0980F9BB-78B2-4C59-B605-2C0CA2E3B26E}"
+        "ProductCode" = "8:{2FCE8255-7E18-4716-8573-F28D109BD39E}"
+        "PackageCode" = "8:{139BA8DD-B0AD-4388-A6EE-B4CF58067511}"
         "UpgradeCode" = "8:{292249F1-B39F-4CA1-AA94-28FA5DA3CFFB}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.5.0"
+        "ProductVersion" = "8:1.6.0"
         "Manufacturer" = "8:Carsten Gehling"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -450,7 +444,7 @@
             "Transitive" = "11:FALSE"
             "Target" = "8:_50F3BB70243F4243B4B1324E58EFC858"
             "Folder" = "8:_F149BF5C8B984C5499876D420686B605"
-            "WorkingFolder" = "8:_BF4C33620F224C9E808A3CECFF38C4DD"
+            "WorkingFolder" = "8:"
             "Icon" = "8:_50F3BB70243F4243B4B1324E58EFC858"
             "Feature" = "8:"
             }
diff --git a/todo.txt b/todo.txt
index e976bb7..e69de29 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1 +0,0 @@
-Option to allow worklog comment to also be posted as a normal comment