Merge pull request #2 from SignpostMarv/master

Using some lazy PHP reflection instead of duplicating code across classes