InIt
Merge pull request #57 from SW2A305/InitProblem

InIt
Merge remote-tracking branch 'origin/master' into Tristan