PHP version++, refactored, code cleanup
Merge pull request #3 from NMOX/master

PHP version++, refactored, code cleanup