fix #310. fix clang compilation error
fix #345. fix clang compilation error
Merge branch 'master' of http://bitbucket.org/dalerank/caesaria