Original Files from Oliver — Matlab based.
Merge branch 'master' into dev
cleaned up.