Fix bugs
Fix bugs
Merge branch 'master' of https://github.com/rising-thunder/rasr-server
Merge pull request #14 from rising-thunder/cilop

Cilop