Improved stability
Merge branch 'master' of github.com:arne-schroppe/sopp