[Laboo] stashing branch
Merge pull request #8 from michalbe/dev

[Laboo] stashing branch