optimization

14-3-9
merge
Merge branch 'master' of https://github.com/moonline/Hardrock