Fix issue #176 - PHP5.2 compatibility
Merge pull request #193 from jrfnl/Issue-176

Fix issue #176 - PHP5.2 compatibility
Merge branch 'master' into folder-structure