Merge pull request #34 from fayeishere/master

About Us - Fixes #6
Merge remote-tracking branch 'upstream/master'
class changes