Fix uninitialized variables
Merge pull request #17 from v-lopez/fixes

Fix uninitialized variables