Merge branch 'master' into dev
Clean-up README.md to avoid confusion
Change to Parameters for the analyser - channel mapping