Combined everyones work.
Merge pull request #1 from BonaventureCS/master

Combined everyones work.