Minor updates to Heterogeneous computing and Multicore Programming
Merge branch 'ls-dev' into develop