Fix for error on latest rustc nightly.

Closes #3.
Merge branch 'fix-nightly-20141017'