Merge branch 'testing' into 'master'

Add comand line parameter and code for testing

See merge request !46
3 jobs for master in 42 seconds (queued for 8 seconds)