Added support for cliphunter