Feature/hasupport

STATUS: Ready to be merged...
Please review