Initialization
Merge branch 'master' of git://github.com/idreamind/x-project