Correct init process
Merge pull request #1 from ngbinh/master

Correct init process