Merge pull request #788 from timhobbs/master

Cast updates