fix for Alison found name bug
Merge branch 'master' into stripe