updated for scrabbli 2.0
merge: