Upgrade to lab 5
Merge pull request #38 from geek/master

Upgrade to lab 5