HUB-144 : Updates initialize
Merge pull request #26 from boiving/master

0.6