Merge pull request #1 from dwizard/master

Added GPA
Cleaned up