Merge pull request #49 from mappum/feat/init-fix

Init Fix