update4
Merge pull request #240 from Litschi/master

update4