added server validations
Merge pull request #19 from shaneob/shane2

added server validations