Updated to work with rust 0.11 nightly (Aug 12th, 2014)