Added capability for multiple arguments and capitalized names.