stuff
Merge pull request #6 from christopherfan/chris_branch

stuff