updated to work with rustc 90d06ec
Merge pull request #15 from csherratt/master

updated to work with rustc 90d06ec