fix annoying assertation on number of programs
Merge branch 'master' into Logging