This has actually been done by Alberto Iturria Slack with my guidance. I reviewed and tested it in one of our projects, and I am submitting this for him.
this solves issue #5