Fixed auto mode
Merge origin/master