Merge pull request #4 from myrlen/develop

Made enabled into product member variable to reduce calls.