a6.1 fixed but untested
created facade and helper classes for better usage