Updating some public fields to be private and use public getter methods instead
Merge pull request #9 from dualspiral/switch

Updating some public fields to be private and use public getter methods ...