Merge pull request #7 from Thingibox/master

test2