diff --git a/main.go b/main.go
index 110bde3b..c5b0056b 100644
--- a/main.go
+++ b/main.go
@@ -114,7 +114,7 @@ func versionCheckOnSigterm(version string, latestVersionChannel chan string) {
 }
 
 func main() {
-	version := "1.5.0"
+	version := "1.5.1"
 	kingpin.Version(version).Author("Luca Grulla")
 	command := kingpin.Parse()
 
diff --git a/main_test.go b/main_test.go
new file mode 100644
index 00000000..5674c8f5
--- /dev/null
+++ b/main_test.go
@@ -0,0 +1,39 @@
+package main
+
+import (
+	//"fmt"
+	"github.com/stretchr/testify/assert"
+	//"reflect"
+	"testing"
+	"time"
+)
+
+func TestTimestampToUTC(t *testing.T) {
+	assert := assert.New(t)
+
+	a := "2017-03-12"
+	assert.Equal(timestampToUTC(&a), time.Date(2017, 3, 12, 0, 0, 0, 0, time.UTC),
+		"wrong parsing for input %s", a)
+
+	a = "2017-03-12T18"
+	assert.Equal(timestampToUTC(&a), time.Date(2017, 3, 12, 18, 0, 0, 0, time.UTC),
+		"wrong parsing for input %s", a)
+
+	a = "2017-03-12T18:22"
+	assert.Equal(timestampToUTC(&a), time.Date(2017, 3, 12, 18, 22, 0, 0, time.UTC),
+		"wrong parsing for input %s", a)
+
+	a = "2017-03-12T18:22:23"
+	assert.Equal(timestampToUTC(&a), time.Date(2017, 3, 12, 18, 22, 23, 0, time.UTC),
+		"wrong parsing for input %s", a)
+
+	a = "18"
+	y, m, d := time.Now().Date()
+	assert.Equal(timestampToUTC(&a), time.Date(y, m, d, 18, 0, 0, 0, time.UTC),
+		"wrong parsing for input %s", a)
+
+	a = "18:31"
+	y, m, d = time.Now().Date()
+	assert.Equal(timestampToUTC(&a), time.Date(y, m, d, 18, 31, 0, 0, time.UTC),
+		"wrong parsing for input %s", a)
+}