Fix docblocks and minor refactoring of __get() method
Merge pull request #4763 from ceeram/3.0-get

Fix docblocks and minor refactoring of __get() method