see #91, updated features