Merge pull request #8 from addisonbgross/abg

SFAFA