#39 - fixed.
#36 - edited isxdigit to use isdigit