Merge branch 'master' of github.com:CatoTH/Ratsinformant