Fix initialization errors
Merge pull request #2 from javiyu/fix_initialization_errors

Fix initialization errors