Add support back in and add more control for supplement.
Add support back in and add more control for supplement.

pvtodorov/indra,johnbachman/indra,pvtodorov/indra,bgyori/indra,bgyori/indra,sorgerlab/indra,johnbachman/belpy,pvtodorov/indra,johnbachman/belpy,pvtodorov/indra,sorgerlab/belpy,sorgerlab/indra,sorgerlab/belpy,johnbachman/indra,bgyori/indra,sorgerlab/belpy,johnbachman/indra,sorgerlab/indra,johnbachman/belpy