merge w. giulio (master)

string=cyl if cylinder seems somewhat hackish... Why not a parameter InputMap?