Further generalization and fixes
Further generalization and fixes

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