Merge pull request #2 from tacoverdo/master

Minor updates, like adding phpDoc