Cleaned up to fix-up pear standard coding style
Merge remote-tracking branch 'origin/master'