Add Support for Feature (Fixed #6)