Merge pull request #1 from BrandonIngalls/master

A