replaced old code
This bug doesn't seem to occur in debian
fix
resolved some warnings
ringlog
Merge branch 'master' into ubuntu