Changed last/first to name
Merge pull request #37 from TomHAnderson/master

last/first > name