Updated project to work on rust-0.6