some changes
Merge branch 'master' of https://github.com/jethrokuan/wolfberry2

* 'master' of https://github.com/jethrokuan/wolfberry2:
  stuff
Merge branch 'master' of https://github.com/jethrokuan/wolfberry2

* 'master' of https://github.com/jethrokuan/wolfberry2:
  stuff