update the code to match the last rust version ( rustc 0.13.0-nightly (126db549b 2014-12-15 00:07:35 +0000) )
Merge branch 'FerarDuanSednan-master'
Fixes to make compiler happy.