minor change on how the initial mode is set
Merge branch 'master' into yacin