Added support for <options> blocks
Merge branch 'master' into gh-pages