Fixed uninitialized variables
Merge pull request #358 from AndHam89/master

Fixed uninitialized variables