diff --git a/.travis.yml b/.travis.yml
index d1722b5..01ba9f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,12 @@ matrix:
   include:
     - rust: 1.2.0
     - rust: stable
+      env:
+        - NODEFAULT=1
     - rust: beta
     - rust: nightly
+      env:
+        - NODEFAULT=1
     - rust: nightly
       env:
       - NODROP_FEATURES='no_drop_flag use_needs_drop'
@@ -14,10 +18,11 @@ branches:
     - master
 script:
   - |
-      [ -z "$NODROP_FEATURES" ] && cargo build --verbose --features "$FEATURES"
-      [ -z "$NODROP_FEATURES" ] && cargo test --verbose --features "$FEATURES"
-      [ -z "$NODROP_FEATURES" ] && cargo test --release --verbose --features "$FEATURES"
-      [ -z "$NODROP_FEATURES" ] && cargo bench --verbose --features "$FEATURES" -- --test
-      [ -z "$NODROP_FEATURES" ] && cargo doc --verbose --features "$FEATURES"
-      cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES"
+      ([ ! -z "$NODROP_FEATURES" ] || cargo build --verbose --features "$FEATURES") &&
+      ([ ! -z "$NODROP_FEATURES" ] || cargo test --verbose --features "$FEATURES") &&
+      ([ ! -z "$NODROP_FEATURES" ] || cargo test --release --verbose --features "$FEATURES") &&
+      ([ ! -z "$NODROP_FEATURES" ] || cargo bench --verbose --features "$FEATURES" -- --test) &&
+      ([ ! -z "$NODROP_FEATURES" ] || cargo doc --verbose --features "$FEATURES") &&
+      ([ "$NODEFAULT" != 1 ] || cargo build --verbose --manifest-path=nodrop/Cargo.toml --no-default-features) &&
+      cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" &&
       cargo bench --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" -- --test
diff --git a/README.rst b/README.rst
index ec99d46..23b1d6d 100644
--- a/README.rst
+++ b/README.rst
@@ -57,6 +57,10 @@ Recent Changes (arrayvec)
 Recent Changes (nodrop)
 -----------------------
 
+- 0.1.6
+
+  - Add feature std, which you can opt out of to use ``no_std``.
+
 - 0.1.5
 
   - Added crate feature ``use_needs_drop`` which is a nightly-only
diff --git a/nodrop/Cargo.toml b/nodrop/Cargo.toml
index 8021198..fe9890a 100644
--- a/nodrop/Cargo.toml
+++ b/nodrop/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nodrop"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["bluss"]
 
 license = "MIT/Apache-2.0"
@@ -9,14 +9,14 @@ description = "A wrapper type to inhibit drop (destructor)."
 documentation = "http://bluss.github.io/arrayvec/doc/nodrop"
 repository = "https://github.com/bluss/arrayvec"
 
-keywords = ["container", "drop"]
+keywords = ["container", "drop", "no_std"]
 
 [features]
 default = ["std"]
 
-# Default, Rust 1.6+
+# Default, requires Rust 1.6+ to disable
 # Use libstd
-std = []
+std = ["odds/std"]
 
 # Optional, nightly channel
 # Use no drop flag. See API doc for more info.
@@ -27,4 +27,5 @@ no_drop_flag = []
 use_needs_drop = []
 
 [dependencies.odds]
-version = "0.2"
+version = "0.2.12"
+default-features = false