Fix gcc warnings. (initialization order)
Merge pull request #387 from Kvalme/master

Fix gcc warnings. (initialization order)