Issue #264, enhancing the views