Merge pull request #7 from mercviper/master

Merging old branch
Merge pull request #8 from mercviper/Accessors-and-Mutators

Merge pull request #7 from mercviper/master