Updated shebang to use /usr/bin/env instead of hardcoding /usr/bin/php
Merge remote-tracking branch 'origin/master'