Upgrade to lab 5
Merge pull request #65 from geek/lab

Upgrade to lab 5