Debugging (towards stable master)
Fixed bug
Master branch seems in stable state now
Added baseline results to test code as comments
Merge branch 'master' into dev
master is stable now. From now on, dev is for new developments, while
master trails and is kept stable