Add new arguments and reorder some of the code#4

Open

bregman-arie wants to merge 1 commit intocelebdor:masterfrom bregman-arie:master

+71-70

Commits on Jan 19, 2017

Add new arguments and reorder some of the code
Arie
committed