Sync Develop

Master seems to be out of sync with develop, this PR rectifies that  and a the `Parse error: syntax error, unexpected T_ELSEIF`