Merge victorette:master

Setup update