Fixing or and times testing
Implementing scan
Merge branch 'develop' of https://github.com/jfeo/fasto into jens/develop
to implement Scan into the develop branch.