Merge pull request #7 from mrtur/2.X-EXPERIMENTAL

added a choice between Custom,Defauld or mrtur
Small fixes