diff --git a/index.js b/index.js
index 7c03fa1..c11ac3c 100644
--- a/index.js
+++ b/index.js
@@ -105,6 +105,8 @@ habitat.parse = function parse(thing) {
  */
 
 habitat.prototype.set = function set(key, value) {
+  if (key.match(/[a-z]+[A-Z]/))
+    return this.set(fromCamelCase(key), value);
   var envkey = this.envkey(key);
   if (typeof value !== 'string' && typeof value !== 'number') {
     if (typeof value === 'object') {
diff --git a/test/habitat.test.js b/test/habitat.test.js
index d50bbcf..8031bcb 100644
--- a/test/habitat.test.js
+++ b/test/habitat.test.js
@@ -52,6 +52,13 @@ test('habitat#set: set an array value', function (t) {
   t.end();
 });
 
+test('habitat#set: set a value with camelcase key', function (t) {
+  var env = new habitat('setCamelcase');
+  env.set('camelCase', 'foo');
+  t.same(env.get('camelCase'), 'foo');
+  t.end();
+});
+
 test('habitat#temp: syncronous', function (t) {
   var env = new habitat('habitat');
   process.env['HABITAT_HELLO'] = 'universe';
@@ -130,6 +137,38 @@ test('habitat constructor: partially overwritten second-level defaults', functio
   delete process.env['HABITAT_PARENT_SECOND']
 });
 
+test('habitat constructor: camelcase defaults', function (t) {
+  var env = new habitat('camelCaseDefaults', {
+    camelCase: 'foo'
+  });
+  t.same(env.get('camelCase'), 'foo');
+  t.end();
+});
+
+test('habitat constructor: second-level camelcase defaults', function (t) {
+  var env = new habitat('secondLevelCamelCaseDefaults', {
+    parentKey: {
+      child: 'foo'
+    }
+  });
+  t.same(env.get('parentKeyChild'), 'foo');
+  t.end();
+});
+
+test('habitat constructor: partially overwritten second-level camelcase defaults', function (t) {
+  process.env['PARTIALLY_OVERWRITTEN_SECOND_LEVEL_CAMEL_CASE_PARENT_KEY_SECOND_CHILD'] = 'overwritten';
+  var env = new habitat('partiallyOverwrittenSecondLevelCamelCase', {
+    parentKey: {
+      firstChild: 'foo',
+      secondChild: 'bar'
+    }
+  });
+  t.same(env.get('parentKeyFirstChild'), 'foo');
+  t.same(env.get('parentKeySecondChild'), 'overwritten');
+  t.end();
+  delete process.env['PARTIALLY_OVERWRITTEN_SECOND_LEVEL_CAMEL_CASE_PARENT_KEY_SECOND_CHILD'];
+});
+
 test('habitat#unset', function (t) {
   process.env['HABITAT_WUT'] = 'lol';
   var env = new habitat('habitat');