Merge pull request #1 from TohaL/master

test