Correct compilation errors #7
Merge branch 'init'