Take 1.

First tests …
test
Merge branch 'friluk' of github.com:drunknzombiecow/ivis-exp into nils
merge nils & friluk