Added simple validation and proper case, resolved #2