Fix #24
Cleaning up php code
Cleaning up php code
Cleaning up php code