Fix slave folder

Nothing important.
Merge branch 'beta'