(#23) Angular support, bug fix