Fixed handling of extras directories.
Added a new parameter "inteval" for callables.
Merge branch 'extras-fix'
Merge branch 'interval-feature'
Merge remote-tracking branch 'remotes/origin/master'