added hex support