Init changed
Merge branch 'master' into JesseMOE