Issue #54: added push/pop active state