completes #160 functionality wise. Needs some test which will come later :)
Also added a small demonstration notebook