Merge pull request #6 from pererik-mahl/master

rnd