Update initialization
Merge pull request #51 from mgechev/master

Update initialization