diff --git a/argv_test.go b/argv_test.go
index 3fa4f94..d8ab442 100644
--- a/argv_test.go
+++ b/argv_test.go
@@ -14,6 +14,7 @@ var _ = Describe("ArgvConfig", func() {
 	BeforeEach(func() {
 		cfg = NewArgvConfig("test")
 		err = cfg.Load()
+		Expect(err == nil)
 	})
 	It("Should load variables from commandline", func() {
 		Expect(len(cfg.All()) >= 0).To(BeTrue())
diff --git a/env.go b/env.go
index d09bd40..27e9518 100644
--- a/env.go
+++ b/env.go
@@ -26,8 +26,8 @@ func NewEnvConfig(prefix string) ReadableConfig {
 func (self *EnvConfig) Load() (err error) {
 	env := os.Environ()
 	for _, pair := range env {
-		kv := strings.Split(pair, "=")
-		if kv != nil && len(kv) >= 2 {
+		kv := strings.SplitN(pair, "=", 2)
+		if kv != nil && len(kv) == 2 {
 			self.Set(strings.Replace(kv[0], self.Prefix, "", 1), kv[1])
 		}
 	}
diff --git a/env_test.go b/env_test.go
index 23d307f..d0d01e2 100644
--- a/env_test.go
+++ b/env_test.go
@@ -1,7 +1,6 @@
-package gonfig_test
+package gonfig
 
 import (
-	. "github.com/Nomon/gonfig"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"os"
@@ -16,14 +15,15 @@ var _ = Describe("EnvConfig", func() {
 	BeforeEach(func() {
 		cfg = NewEnvConfig("")
 		err = cfg.Load()
+		Expect(err == nil)
 	})
 	It("Should load variables from environment", func() {
 		Expect(len(cfg.All()) > 0).To(BeTrue())
 		env := os.Environ()
 		Expect(len(env) > 0).To(BeTrue())
 		for _, kvpair := range env {
-			pairs := strings.Split(kvpair, "=")
-			Expect(len(pairs) >= 2).To(BeTrue())
+			pairs := strings.SplitN(kvpair, "=", 2)
+			Expect(len(pairs) == 2).To(BeTrue())
 			Expect(cfg.Get(pairs[0])).To(Equal(pairs[1]))
 		}
 	})
diff --git a/gonfig.go b/gonfig.go
index 74cb3f2..ce0da99 100644
--- a/gonfig.go
+++ b/gonfig.go
@@ -51,6 +51,8 @@ type Gonfig struct {
 	Configurable
 	// named configurables, these are iterated if key is not found in Config
 	Configs map[string]Configurable
+
+	keys []string
 	// Defaults configurable, if key is not found in the Configurable & Configurables in Config,
 	//Defaults is checked for fallback values
 	Defaults Configurable
@@ -74,6 +76,7 @@ func NewConfig(initial Configurable, defaults ...Configurable) *Gonfig {
 	return &Gonfig{
 		initial,
 		make(map[string]Configurable),
+			make([]string, 0, 1),
 		defaults[0],
 	}
 }
@@ -116,7 +119,8 @@ func (self *Gonfig) Reset(datas ...map[string]string) {
 	if len(datas) > 0 {
 		data = datas[0]
 	}
-	for _, value := range self.Configs {
+	for _, name := range self.keys {
+		value := self.Configs[name]
 		if data != nil {
 			value.Reset(data)
 		} else {
@@ -139,11 +143,13 @@ func (self *Gonfig) Reset(datas ...map[string]string) {
 func (self *Gonfig) Use(name string, config ...Configurable) Configurable {
 	if self.Configs == nil {
 		self.Configs = make(map[string]Configurable)
+		self.keys = make([]string, 0, len(config))
 	}
 	if len(config) == 0 {
 		return self.Configs[name]
 	}
 	self.Configs[name] = config[0]
+	self.keys = append(self.keys, name)
 	LoadConfig(self.Configs[name])
 	return self.Configs[name]
 }
@@ -155,7 +161,11 @@ func (self *Gonfig) Get(key string) string {
 		return value
 	}
 	// go through all in insert order untill key is found
-	for _, config := range self.Configs {
+	for _, name := range self.keys {
+		config := self.Configs[name]
+		if config == nil {
+			break
+		}
 		if value := config.Get(key); value != "" {
 			return value
 		}
@@ -182,7 +192,8 @@ func SaveConfig(config Configurable) error {
 
 // Saves all mounted configurations in the hierarchy that implement the WritableConfig interface
 func (self *Gonfig) Save() error {
-	for _, config := range self.Configs {
+	for _, name := range self.keys {
+		config := self.Configs[name]
 		if err := SaveConfig(config); err != nil {
 			return err
 		}