More changes for initialization
Merge branch 'master' of github.com:GonzoGhanem/gonzoft