Fix some bug
Remove session merging
Merge branch 'master'
Remove My settings
Add sample settings