Merge branch 'master' into xinyu
added xzing lib
Merge branch 'master' of https://github.com/louisel/chillicrab