Changed author strings
Changed author name
Merge branch 'master' of https://github.com/ccphillippi/AFP.git
Changed author name