Merge all changes from auto_play branch

Merging all changes from auto_play branch into master