Issue#148: Cleanup warnings
Merge pull request #149 from potentialventures/Issue#148

Pull request for Issue #148
Issue #128: Correct warnings from other gcc versions