diff --git a/README.md b/README.md
index 3ca0e7d..02ac951 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Go Report Card](https://goreportcard.com/badge/github.com/Kilgaloon/Leprechaun)](https://goreportcard.com/report/github.com/Kilgaloon/Leprechaun)
 
-Current Version: **0.4.0** <br />
+Current Version: **0.5.0** <br />
 Current Release: **Calimero**
 
 **Leprechaun** is tool where you can schedule your recurring tasks to be performed over and over. 
diff --git a/bin/client.go b/bin/client.go
index b2bfb55..c366443 100644
--- a/bin/client.go
+++ b/bin/client.go
@@ -7,7 +7,7 @@ import (
 
 // VERSION of application
 const (
-	VERSION = "0.4.0"
+	VERSION = "0.5.0"
 	RELEASE = "Calimero"
 )
 
diff --git a/src/client/config.go b/src/client/config.go
index 77de89b..c1ea37c 100644
--- a/src/client/config.go
+++ b/src/client/config.go
@@ -3,6 +3,8 @@ package client
 import (
 	"../log"
 	"gopkg.in/ini.v1"
+	"os"
+	"strings"
 )
 
 // Config values
@@ -27,6 +29,11 @@ func readConfig(path string) *Config {
 	for _, variable := range variables {
 		CurrentContext.DefineVar(variable.Name(), variable.String())
 	}
+	// insert environment variables in our context
+	for _, e := range os.Environ() {
+        pair := strings.Split(e, "=")
+		CurrentContext.DefineVar(pair[0], pair[1])
+	}
 
 	log.Logger.ErrorLog = c.errorLog
 	log.Logger.InfoLog = c.infoLog
diff --git a/src/client/context.go b/src/client/context.go
index 5dc7e0a..22167df 100644
--- a/src/client/context.go
+++ b/src/client/context.go
@@ -42,13 +42,11 @@ func (c *Context) GetVar(name string) Variable {
 
 // Transpile text change variables from context
 func (c *Context) Transpile(toCompile string) string {
-	var str string
-
 	for _, variable := range c.variables {
-		str = strings.Replace(toCompile, "$"+variable.name, variable.value, -1)
+		toCompile = strings.Replace(toCompile, "$"+variable.name, variable.value, -1)
 	}
 
-	return str
+	return toCompile
 }
 
 // CurrentContext of client