Merge pull request #39 from wpreul/master

Converting to use lab