vid-15
Merge branch 'master' into preferences-part-1
Merge pull request #4 from lvguowei/preferences-part-1

Preferences part 1