Refactor main func and test (works!)
Refactor main func and test (works!)

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