Updated to lab 4.
PR updates.
Merged from master.
Merge pull request #20 from arb/lab-upgrade

Lab upgrade