Josh Commit 1
Merge pull request #3 from adamlehde/josh_branch

Josh Commit 1