First Pass
Merge pull request #1 from caseyg1204/master

First Pass