Merge pull request #214 from mbuesch/warningfix

Fix warnings: 'may be used uninitialized in this function'