Changed to a parseInt instead of checking both. Refs #34