Correct constructor calls #7
Correct consturctor calls #7
Merge branch 'init'