Merge pull request #1 from b97jre/master

Add all Johans changes
Small fix to QC-lab
output link in QC-lab
Merge pull request #4 from asabjorklund/master

Small changes in QC-lab