Merge pull request #21 from ysfl/master

Ore to add
Merge branch 'master' of git://github.com/blizzlikegroup/blizzlikecore
Merge branch 'master' of git://github.com/blizzlikegroup/blizzlikecore
Merge branch 'master' of git://github.com/blizzlikegroup/blizzlikecore
Merge branch 'master' of git://github.com/blizzlikegroup/blizzlikecore