Static Analysis bugfix
Merge pull request #381 from spaun2002/mywork

fix static analysis warnings