additional options are added
Merge branch 'leejay'