Include check to make sure there are POST values
Merge remote-tracking branch 'origin/master'