Fixed variable initialization bugs
Merge pull request #3 from duozmo/master

Fixed variable initialization bugs