delayed option bugfix: prevents from running the first time when condition is false
Merge branch 'master' into gh-pages
docs update