Updated to work with latest version of rust nightly