#20 Updated header
#20 Added check for special character in name