Merge pull request #15 from TisButMe/master

Fixed master to follow the changes in rustc