fixed for latest rust and included+fixed pull request #54