rm readme.txt
Merge branch 'wn_master'
Merge branch 'zd_master'