Merge pull request #27 from Heather/master

Apply rust language updates from 2013-12-05