some fix
Merge https://github.com/Etherlords/reality-0.1 into HEAD