Merge 2048_evil with branch Master