Merge pull request #3 from TohaL/master

oooo