Merge pull request #8 from houbena/master

test 1052