some changes
Merge branch 'Jesper' of https://github.com/monkeybroth/wenyiwen into Jesper