Feature/hasupport

STATUS: Ready to be merged...
Please review
from _within_ ..