Merge pull request #22 from wpreul/master

Now using lab and added missing tests
merge bug