add if to check it it a get or post request
Merge remote-tracking branch 'origin/master'