some really complex tests
handle the backwards with a conjunction
Merge branch 'master' into gh-pages