modified options in directive
Merge branch 'master' into gh-pages